From e0d01cc6b7a3426bdc15b9954c1a6a97be28e7d2 Mon Sep 17 00:00:00 2001 From: "adsharma@los-vmm.sc.intel.com" Date: Mon, 22 Aug 2005 11:04:15 -0700 Subject: [PATCH] Rename INSTRUCTION_LEN to VM_EXIT_INSTRUCTION_LEN to be consistent with VM_ENTRY_INSTRUCTION_LEN Signed-off-by: Eddie Dong Signed-off-by: Arun Sharma --- xen/arch/x86/vmx.c | 8 ++++---- xen/arch/x86/vmx_platform.c | 2 +- xen/include/asm-x86/vmx_vmcs.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c index c2647193fe..c097c8bf63 100644 --- a/xen/arch/x86/vmx.c +++ b/xen/arch/x86/vmx.c @@ -351,7 +351,7 @@ void stop_vmx(void) * Not all cases receive valid value in the VM-exit instruction length field. */ #define __get_instruction_length(len) \ - __vmread(INSTRUCTION_LEN, &(len)); \ + __vmread(VM_EXIT_INSTRUCTION_LEN, &(len)); \ if ((len) < 1 || (len) > 15) \ __vmx_bug(®s); @@ -389,7 +389,7 @@ static int vmx_do_page_fault(unsigned long va, struct cpu_user_regs *regs) if ( mmio_space(gpa) ){ if (gpa >= 0xFEE00000) { /* workaround for local APIC */ u32 inst_len; - __vmread(INSTRUCTION_LEN, &(inst_len)); + __vmread(VM_EXIT_INSTRUCTION_LEN, &(inst_len)); __update_guest_eip(inst_len); return 1; } @@ -542,7 +542,7 @@ static int check_for_null_selector(unsigned long eip) int i, inst_len; int inst_copy_from_guest(unsigned char *, unsigned long, int); - __vmread(INSTRUCTION_LEN, &inst_len); + __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len); memset(inst, 0, MAX_INST_LEN); if (inst_copy_from_guest(inst, eip, inst_len) != inst_len) { printf("check_for_null_selector: get guest instruction failed\n"); @@ -712,7 +712,7 @@ vmx_world_save(struct vcpu *d, struct vmx_assist_context *c) unsigned long inst_len; int error = 0; - error |= __vmread(INSTRUCTION_LEN, &inst_len); + error |= __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len); error |= __vmread(GUEST_RIP, &c->eip); c->eip += inst_len; /* skip transition instruction */ error |= __vmread(GUEST_RSP, &c->esp); diff --git a/xen/arch/x86/vmx_platform.c b/xen/arch/x86/vmx_platform.c index 34b7d8e6f8..65ff6c1f52 100644 --- a/xen/arch/x86/vmx_platform.c +++ b/xen/arch/x86/vmx_platform.c @@ -639,7 +639,7 @@ void handle_mmio(unsigned long va, unsigned long gpa) inst_decoder_regs = mpci_p->inst_decoder_regs; __vmread(GUEST_RIP, &eip); - __vmread(INSTRUCTION_LEN, &inst_len); + __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len); __vmread(GUEST_RFLAGS, &eflags); vm86 = eflags & X86_EFLAGS_VM; diff --git a/xen/include/asm-x86/vmx_vmcs.h b/xen/include/asm-x86/vmx_vmcs.h index 49a7d1c0bf..9c26ef4f97 100644 --- a/xen/include/asm-x86/vmx_vmcs.h +++ b/xen/include/asm-x86/vmx_vmcs.h @@ -183,7 +183,7 @@ enum vmcs_field { VM_ENTRY_MSR_LOAD_COUNT = 0x00004014, VM_ENTRY_INTR_INFO_FIELD = 0x00004016, VM_ENTRY_EXCEPTION_ERROR_CODE = 0x00004018, - VM_ENTRY_INSTRUCTION_LENGTH = 0x0000401a, + VM_ENTRY_INSTRUCTION_LEN = 0x0000401a, TPR_THRESHOLD = 0x0000401c, SECONDARY_VM_EXEC_CONTROL = 0x0000401e, VM_INSTRUCTION_ERROR = 0x00004400, @@ -192,7 +192,7 @@ enum vmcs_field { VM_EXIT_INTR_ERROR_CODE = 0x00004406, IDT_VECTORING_INFO_FIELD = 0x00004408, IDT_VECTORING_ERROR_CODE = 0x0000440a, - INSTRUCTION_LEN = 0x0000440c, + VM_EXIT_INSTRUCTION_LEN = 0x0000440c, VMX_INSTRUCTION_INFO = 0x0000440e, GUEST_ES_LIMIT = 0x00004800, GUEST_CS_LIMIT = 0x00004802, -- 2.30.2